From: emellor@ewan <emellor@ewan>
Date: Thu, 22 Sep 2005 15:12:14 +0000 (+0100)
Subject: Merged.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16780^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3f962c0f211cd3f3ab91e49ad6000eb8833bcd6e;p=xen.git

Merged.
---

3f962c0f211cd3f3ab91e49ad6000eb8833bcd6e
diff --cc tools/python/xen/xend/XendDomain.py
index b790f31726,76d4fce4a9..843c912fb9
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@@ -305,6 -305,7 +305,13 @@@ class XendDomain
  
          @param vmconfig: vm configuration
          """
 -        config = sxp.child_value(vmconfig, 'config')
++        # We accept our configuration specified as ['config' [...]], which
++        # some tools or configuration files may be using.  For save-restore,
++        # we use the value of XendDomainInfo.sxpr() directly, which has no
++        # such item.
++        nested = sxp.child_value(config, 'config')
++        if nested:
++            config = nested
          return XendDomainInfo.restore(self.dbmap.getPath(), config)
  
      def domain_restore(self, src, progress=False):